From b46f50d68f86100d940a8495fa564e87cde6f10f Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Sun, 2 Aug 2020 09:49:03 +0100 Subject: [PATCH] qmake: stop using -isystem flag Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a5dd0b4e68724ecd Last-Update: 2020-06-29 Gbp-Pq: Name no_isystem.diff --- qmake/generators/unix/unixmake2.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 91470fb12..9ad69bac2 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -198,18 +198,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; t << "INCPATH ="; { - QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); const ProStringList &incs = project->values("INCLUDEPATH"); for(int i = 0; i < incs.size(); ++i) { const ProString &inc = incs.at(i); if (inc.isEmpty()) continue; - if (!isystem.isEmpty() && isSystemInclude(inc.toQString())) - t << ' ' << isystem << ' '; - else - t << " -I"; - t << escapeFilePath(inc); + t << " -I" << escapeFilePath(inc); } } if(!project->isEmpty("QMAKE_FRAMEWORKPATH_FLAGS")) @@ -1393,8 +1388,7 @@ void UnixMakefileGenerator::init2() } if (include_deps && project->isActiveConfig("gcc_MD_depends")) { - // use -MMD if we know about -isystem too - ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD"); + ProString MD_flag("-MD"); project->values("QMAKE_CFLAGS") += MD_flag; project->values("QMAKE_CXXFLAGS") += MD_flag; } -- 2.30.2